diff --git a/rfb/ScaledPixelBuffer.cxx b/rfb/ScaledPixelBuffer.cxx
index bd1ff72..bf4612d 100644
--- a/rfb/ScaledPixelBuffer.cxx
+++ b/rfb/ScaledPixelBuffer.cxx
@@ -45,8 +45,7 @@
   src_data = src_data_;
   src_width  = w;
   src_height = h;
-  scaled_width  = (int)ceil(src_width  * scale_ratio);
-  scaled_height = (int)ceil(src_height * scale_ratio);
+  calculateScaledBufferSize();
   recreateScaledBuffer();
 }
 
@@ -54,13 +53,8 @@
   if (scale != scale_) {
     scale = scale_;
     scale_ratio = double(scale) / 100;
-
-    scaled_width  = (int)ceil(src_width  * scale_ratio);
-    scaled_height = (int)ceil(src_height * scale_ratio);
-
+    calculateScaledBufferSize();
     recreateScaledBuffer();
-
-    scaleRect(Rect(0, 0, scaled_width, scaled_height));
   }
 }
 
@@ -129,5 +123,10 @@
   return Rect(x_start, y_start, x_end, y_end);
 }
 
+void ScaledPixelBuffer::calculateScaledBufferSize() {
+  scaled_width  = (int)ceil(src_width  * scale_ratio);
+  scaled_height = (int)ceil(src_height * scale_ratio);
+}
+
 void ScaledPixelBuffer::recreateScaledBuffer() {
 }