diff --git a/Painter/src/bz/bronze/painter/Context.java b/Painter/src/bz/bronze/painter/Context.java
index 0dba227..e1736c8 100644
--- a/Painter/src/bz/bronze/painter/Context.java
+++ b/Painter/src/bz/bronze/painter/Context.java
@@ -15,7 +15,7 @@ public class Context {
 	static BufferedImage bufferedImage = new BufferedImage(Window.paintArea.getWidth(), Window.paintArea.getHeight(), BufferedImage.TYPE_INT_ARGB);
     static RenderedImage renderedImage;
     
-    static Graphics g = bufferedImage.createGraphics();
+    static Graphics g = Window.paintArea.getGraphics();
 	
 	public static void drawBorders(Graphics g)
 	{		
diff --git a/Painter/src/bz/bronze/painter/Save.java b/Painter/src/bz/bronze/painter/Save.java
index 1d07ff5..ae29367 100644
--- a/Painter/src/bz/bronze/painter/Save.java
+++ b/Painter/src/bz/bronze/painter/Save.java
@@ -11,7 +11,7 @@ public class Save {
 		
 		try
 		{
-			ImageIO.write(Context.renderedImage, "png", Window.filePicker.getSelectedFile());
+			ImageIO.write(Window.paintArea.getGraphics(), "png", Window.filePicker.getSelectedFile());
 			Log.print("[INFO] Image Saved!");
 		} catch (IOException e) {
 			e.printStackTrace();