diff --git a/lime/graphics/Image.hx b/lime/graphics/Image.hx
index 3b689937a..4cae74756 100644
--- a/lime/graphics/Image.hx
+++ b/lime/graphics/Image.hx
@@ -18,28 +18,21 @@ class Image {
 	private static var __context:CanvasRenderingContext2D;
 	#end
 	
-	#if (js || flash)
 	public var bytes (get, set):UInt8Array;
-	#else
-	public var bytes:UInt8Array;
-	#end
-	
 	public var data:ImageData;
 	public var height:Int;
 	public var offsetX:Int;
 	public var offsetY:Int;
 	public var width:Int;
 	
-	#if (js || flash)
 	private var __bytes:UInt8Array;
-	#end
 	
 	
 	public function new (data:ImageData = null, width:Int = 0, height:Int = 0) {
 		
 		this.data = data;
 		#if (!js && !flash)
-		this.bytes = data;
+		this.__bytes = data;
 		#end
 		
 		this.width = width;
@@ -48,10 +41,9 @@ class Image {
 	}
 	
 	
-	#if (js || flash)
 	private function get_bytes ():UInt8Array {
 		
-		if (data != null && width > 0 && height > 0) {
+		if (__bytes == null && data != null && width > 0 && height > 0) {
 			
 			#if js
 			
@@ -65,7 +57,7 @@ class Image {
 			__canvas.width = width;
 			__canvas.height = height;
 			__context.drawImage (data, 0, 0);
-			js.Browser.document.body.appendChild (__canvas);
+			Browser.document.body.appendChild (__canvas);
 			
 			var pixels = __context.getImageData (0, 0, width, height);
 			__bytes = new UInt8Array (pixels.data);
@@ -89,7 +81,6 @@ class Image {
 		return __bytes = value;
 		
 	}
-	#end
 	
 	
 }
diff --git a/samples/SimpleImage/Source/Main.hx b/samples/SimpleImage/Source/Main.hx
index f39b96d4a..64540aa82 100644
--- a/samples/SimpleImage/Source/Main.hx
+++ b/samples/SimpleImage/Source/Main.hx
@@ -149,7 +149,7 @@ class Main extends Application {
 				#if js
 				gl.texImage2D (gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, image.data);
 				#else
-				gl.texImage2D (gl.TEXTURE_2D, 0, gl.RGBA, image.width, image.height, 0, gl.RGBA, gl.UNSIGNED_BYTE, image.data);
+				gl.texImage2D (gl.TEXTURE_2D, 0, gl.RGBA, image.width, image.height, 0, gl.RGBA, gl.UNSIGNED_BYTE, image.bytes);
 				#end
 				gl.texParameteri (gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR);
 				gl.texParameteri (gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR);
diff --git a/templates/haxe/DefaultAssetLibrary.hx b/templates/haxe/DefaultAssetLibrary.hx
index 98553649d..6b926d0cb 100644
--- a/templates/haxe/DefaultAssetLibrary.hx
+++ b/templates/haxe/DefaultAssetLibrary.hx
@@ -449,7 +449,7 @@ class DefaultAssetLibrary extends AssetLibrary {
 			loader.contentLoaderInfo.addEventListener (Event.COMPLETE, function (event:Event) {
 				
 				var bitmapData = cast (event.currentTarget.content, Bitmap).bitmapData;
-				handler (new Image (bitmapData.width, bitmapData.height, new UInt8Array (bitmapData.getPixels (bitmapData.rect))));
+				handler (new Image (bitmapData, bitmapData.width, bitmapData.height));
 				
 			});
 			loader.load (new URLRequest (path.get (id)));