diff --git a/lime/graphics/format/BMP.hx b/lime/graphics/format/BMP.hx
index 61794482a..5bc48e1ef 100644
--- a/lime/graphics/format/BMP.hx
+++ b/lime/graphics/format/BMP.hx
@@ -37,7 +37,10 @@ class BMP {
 		}
 		
 		var data = new ByteArray (fileHeaderLength + infoHeaderLength + pixelValuesLength);
+		
+		#if (cpp || neko)
 		data.bigEndian = false;
+		#end
 		
 		if (fileHeaderLength > 0) {
 			
diff --git a/lime/graphics/utils/ImageCanvasUtil.hx b/lime/graphics/utils/ImageCanvasUtil.hx
index 45fea5514..f1820096d 100644
--- a/lime/graphics/utils/ImageCanvasUtil.hx
+++ b/lime/graphics/utils/ImageCanvasUtil.hx
@@ -158,15 +158,7 @@ class ImageCanvasUtil {
 			
 			// TODO: Better solution?
 			
-			if (image.type == CANVAS) {
-				
-				buffer.data = cast buffer.__srcImageData.data;
-				
-			} else {
-				
-				buffer.data = new UInt8Array (buffer.__srcImageData.data);
-				
-			}
+			buffer.data = new UInt8Array (buffer.__srcImageData.data);
 			
 		}