diff --git a/JavaApp/src/main/java/jdpi/awt/Graphics.java b/JavaApp/src/main/java/jdpi/awt/Graphics.java
index 0b96d6d7..0f58e1bf 100644
--- a/JavaApp/src/main/java/jdpi/awt/Graphics.java
+++ b/JavaApp/src/main/java/jdpi/awt/Graphics.java
@@ -31,6 +31,6 @@ public class Graphics {
 
 	public boolean drawImage(Image image, int x, int y, ImageObserver observer) {
 		if (!(image instanceof BufferedImage)) return true;
-		return g2d.drawImage(((BufferedImage) image).getBaseImage());
+		return g2d.drawImage(((BufferedImage) image).getBaseImage(), x, y, observer);
 	}
 }
diff --git a/JavaApp/src/main/java/jdpi/awt/image/BufferedImage.java b/JavaApp/src/main/java/jdpi/awt/image/BufferedImage.java
index 2e9605d6..355829cb 100644
--- a/JavaApp/src/main/java/jdpi/awt/image/BufferedImage.java
+++ b/JavaApp/src/main/java/jdpi/awt/image/BufferedImage.java
@@ -1,5 +1,6 @@
 package jdpi.awt.image;
 
+import jdpi.awt.*;
 import jdpi.awt.Image;
 
 public class BufferedImage extends Image {
diff --git a/JavaApp/src/main/java/jdpi/awt/image/ImageObserver.java b/JavaApp/src/main/java/jdpi/awt/image/ImageObserver.java
index 78260c2f..85aae7d4 100644
--- a/JavaApp/src/main/java/jdpi/awt/image/ImageObserver.java
+++ b/JavaApp/src/main/java/jdpi/awt/image/ImageObserver.java
@@ -1,5 +1,7 @@
 package jdpi.awt.image;
 
-public class ImageObserver {
+import jdpi.awt.Image;
 
-}
+public interface ImageObserver extends java.awt.image.ImageObserver {
+    public boolean imageUpdate(Image img, int infoflags, int x, int y, int width, int height);
+}
\ No newline at end of file
diff --git a/JavaApp/src/main/java/jdpi/awt/image/ImageObserverWrapper.java b/JavaApp/src/main/java/jdpi/awt/image/ImageObserverWrapper.java
new file mode 100644
index 00000000..3374a85f
--- /dev/null
+++ b/JavaApp/src/main/java/jdpi/awt/image/ImageObserverWrapper.java
@@ -0,0 +1,15 @@
+package jdpi.awt.image;
+
+import jdpi.awt.Image;
+
+public void ImageObserverWrapper {
+    public java.awt.image.ImageObserver wrap(final ImageObserver observer) {
+        return new java.awt.image.ImageObserver() {
+            public boolean imageUpdate(java.awt.Image img, int infoflags, int x, int y, int width, int height) {
+                if (img instanceof BufferedImage) {
+                    observer.imageUpdate((BufferedImage) imf, infoflags, x, y, width, height);
+                }
+            }
+        };
+    }
+}
\ No newline at end of file