diff --git a/win/rfb_win32/ScaledDIBSectionBuffer.cxx b/win/rfb_win32/ScaledDIBSectionBuffer.cxx
index bd6b4d3..be921f9 100644
--- a/win/rfb_win32/ScaledDIBSectionBuffer.cxx
+++ b/win/rfb_win32/ScaledDIBSectionBuffer.cxx
@@ -45,15 +45,23 @@
     if (!src_buffer) {
       src_buffer = new ManagedPixelBuffer(format, src_width, src_height);
       src_data = &(src_buffer->data);
+      memcpy(src_buffer->data, data, area() * (getPF().bpp/8));
     }
   } else {
     scaling = false;
-    if (src_buffer) delete src_buffer;
-    src_buffer = 0;
-    src_data = 0;
   }
   ScaledPixelBuffer::setScale(scale_);
   recreateScaledBuffer();
+  if (scaling) {
+    scaleRect(Rect(0, 0, src_width, src_height));
+  } else {
+    memcpy(data, src_buffer->data, src_buffer->area() * (src_buffer->getPF().bpp/8));
+    if (src_buffer) {
+      delete src_buffer;
+      src_buffer = 0;
+      src_data = 0;
+    }
+  }
 }
 
 void ScaledDIBSectionBuffer::setPF(const PixelFormat &pf_) {