diff --git a/JavaApp/src/main/java/jdpi/awt/Graphics.java b/JavaApp/src/main/java/jdpi/awt/Graphics.java
index 07113193..2b24b2eb 100644
--- a/JavaApp/src/main/java/jdpi/awt/Graphics.java
+++ b/JavaApp/src/main/java/jdpi/awt/Graphics.java
@@ -27,6 +27,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(), x, y, observer);
+		return g2d.drawImage(((BufferedImage) image).getBaseImage(), x, y, ImageObserverWrapper.wrap(observer));
 	}
 }
diff --git a/JavaApp/src/main/java/jdpi/awt/image/ImageObserverWrapper.java b/JavaApp/src/main/java/jdpi/awt/image/ImageObserverWrapper.java
index 4c34229d..59e36062 100644
--- a/JavaApp/src/main/java/jdpi/awt/image/ImageObserverWrapper.java
+++ b/JavaApp/src/main/java/jdpi/awt/image/ImageObserverWrapper.java
@@ -2,9 +2,10 @@ package jdpi.awt.image;
 
 import jdpi.awt.Image;
 
-public void ImageObserverWrapper {
-    public java.awt.image.ImageObserver wrap(final ImageObserver observer) {
+public class ImageObserverWrapper {
+    public static java.awt.image.ImageObserver wrap(final ImageObserver observer) {
         return new java.awt.image.ImageObserver() {
+            @Override
             public boolean imageUpdate(java.awt.Image img, int infoflags, int x, int y, int width, int height) {
                 if (img instanceof java.awt.image.BufferedImage) {
                     observer.imageUpdate(new BufferedImage((java.awt.image.BufferedImage) img), infoflags, x, y, width, height);
@@ -12,4 +13,4 @@ public void ImageObserverWrapper {
             }
         };
     }
-}
\ No newline at end of file
+}