diff --git a/src/Load.lua b/src/Load.lua
index 685e45c..389589e 100755
--- a/src/Load.lua
+++ b/src/Load.lua
@@ -169,9 +169,16 @@ function love.load()
 
    -- initialize GFX mode
    love.window.setMode( 0, 0, {fullscreen=false, vsync=false, msaa=0} )
-   desktopWidth,desktopHeight,fullscreen,vsyncEnabled,fsaa=love.window.getMode()
+   local flags={}
+   desktopWidth,desktopHeight,flags=love.window.getMode()
+   fullscreen=flags.fullscreen
+   vsyncEnabled=flags.vsync
+   fsaa=flags.msaa
    initializeFullscreenMode()
    love.graphics.setDefaultFilter("nearest","nearest")
+   if fullscreen then 
+      toggleScaling()
+   end
    
    --canvas1X=love.graphics.newCanvas(width,height)
    --canvas1X:setFilter("nearest","nearest")
diff --git a/src/ScreenModes.lua b/src/ScreenModes.lua
index f78ee30..508f762 100755
--- a/src/ScreenModes.lua
+++ b/src/ScreenModes.lua
@@ -12,7 +12,13 @@ end
 function initializeWindowedMode()
    local width,height=2*width,2*height
    love.window.setMode( width, height, {fullscreen=false, vsync=false, msaa=0} )
-   fullscreenWidth,fullscreenHeight,fullscreen,vSyncEnabled,fsaa=love.window.getMode()
+
+   local flags={}
+   fullscreenWidth,fullscreenHeight,flags=love.window.getMode()
+   fullscreen=flags.fullscreen
+   vsyncEnabled=flags.vsync
+   fsaa=flags.msaa
+
    love.window.setTitle("Arne's Spacetaxi")
    borderX=0
    borderY=0
@@ -24,7 +30,13 @@ function initializeFullscreenMode()
    local width=2*width
    local height=2*height
    love.window.setMode( desktopWidth, desktopHeight, {fullscreen=true, vsync=true, msaa=0} )
-   fullscreenWidth,fullscreenHeight,fullscreen,vSyncEnabled,fsaa=love.window.getMode()
+
+   local flags={}
+   fullscreenWidth,fullscreenHeight,flags=love.window.getMode()
+   fullscreen=flags.fullscreen
+   vsyncEnabled=flags.vsync
+   fsaa=flags.msaa
+
    if fullscreenWidth>width then
       borderX=math.floor((fullscreenWidth-width)/2)
    end