diff --git a/rfb/ScaledPixelBuffer.cxx b/rfb/ScaledPixelBuffer.cxx
index 0c4d5ab..962a54b 100644
--- a/rfb/ScaledPixelBuffer.cxx
+++ b/rfb/ScaledPixelBuffer.cxx
@@ -36,7 +36,7 @@
   scaled_width  = (int)ceil(src_width  * scale_ratio);
   scaled_height = (int)ceil(src_height * scale_ratio);
   
-  scaled_data = new U8[scaled_width * scaled_height * 4];
+  recreateScaledBuffer();
 }
 
 ScaledPixelBuffer::ScaledPixelBuffer() 
@@ -78,8 +78,7 @@
     scaled_width  = (int)ceil(src_width  * scale_ratio);
     scaled_height = (int)ceil(src_height * scale_ratio);
 
-    if (scaled_data) delete [] scaled_data;
-    scaled_data = new U8[scaled_width * scaled_height * 4];
+    recreateScaledBuffer();
 
     scaleRect(Rect(0, 0, scaled_width, scaled_height));
   }
@@ -145,3 +144,8 @@
     }
   }
 }
+
+void ScaledPixelBuffer::recreateScaledBuffer() {
+  if (scaled_data) delete [] scaled_data;
+  scaled_data = new U8[scaled_width * scaled_height * (bpp / 8)];
+}