diff --git a/Applications/MineCodeIDE/Main.lua b/Applications/MineCodeIDE/Main.lua
index 22f7e605..e2734978 100755
--- a/Applications/MineCodeIDE/Main.lua
+++ b/Applications/MineCodeIDE/Main.lua
@@ -843,17 +843,17 @@ local function continue()
 		if coroutine.status(scriptCoroutine) == "dead" then
 			MineOSInterface.waitForPressingAnyKey()
 			hideErrorContainer()
-			buffer.setResolution(oldResolutionX, oldResolutionY); mainContainer:draw(); buffer.draw(true)
+			buffer.setResolution(oldResolutionX, oldResolutionY); mainContainer:drawOnScreen();
 		else
 			-- Тест на пидора, мало ли у чувака в проге тоже есть yield
 			if _G.MineCodeIDEDebugInfo then
-				buffer.setResolution(oldResolutionX, oldResolutionY); mainContainer:draw(); buffer.draw(true)
+				buffer.setResolution(oldResolutionX, oldResolutionY); mainContainer:drawOnScreen();
 				gotoLine(_G.MineCodeIDEDebugInfo.line)
 				showBreakpointMessage(_G.MineCodeIDEDebugInfo.variables)
 			end
 		end
 	else
-		buffer.setResolution(oldResolutionX, oldResolutionY); mainContainer:draw(); buffer.draw(true)
+		buffer.setResolution(oldResolutionX, oldResolutionY); mainContainer:drawOnScreen();
 		showErrorContainer(debug.traceback(scriptCoroutine, coroutineResumeReason))
 	end
 end
diff --git a/Applications/PrintImage/Main.lua b/Applications/PrintImage/Main.lua
index 99ac5318..f9f42ea4 100755
--- a/Applications/PrintImage/Main.lua
+++ b/Applications/PrintImage/Main.lua
@@ -140,8 +140,7 @@ local function beginPrint()
 	end
 
 	buffer.clear()
-	mainContainer:draw()
-	buffer.draw(true)
+	mainContainer:drawOnScreen()
 end
 
 ----------------------------------------- Window-zaluped parasha -----------------------------------------
diff --git a/Applications/Spinner/Main.lua b/Applications/Spinner/Main.lua
index 7cb9e223..95914417 100644
--- a/Applications/Spinner/Main.lua
+++ b/Applications/Spinner/Main.lua
@@ -77,8 +77,7 @@ spinnerImage.localY = math.floor(mainContainer.height / 2 - spinnerImage.height/
 
 changeColor(spinnerHue, 1)
 buffer.flush()
-mainContainer:draw()
-buffer.draw(true)
+mainContainer:drawOnScreen()
 
 mainContainer:startEventHandling(0)
 
diff --git a/Applications/Stargate/Main.lua b/Applications/Stargate/Main.lua
index 740ab5b4..c833d71c 100755
--- a/Applications/Stargate/Main.lua
+++ b/Applications/Stargate/Main.lua
@@ -306,8 +306,7 @@ updateContacts()
 update()
 updateChevrons(stargate.stargateState() == "Connected")
 
-mainContainer:draw()
-buffer.draw(true)
+mainContainer:drawOnScreen()
 mainContainer:startEventHandling()
 
 
diff --git a/Applications/Translate/Main.lua b/Applications/Translate/Main.lua
index 9955112b..4cf03edf 100644
--- a/Applications/Translate/Main.lua
+++ b/Applications/Translate/Main.lua
@@ -184,8 +184,7 @@ checkLanguages()
 fromComboBox.selectedItem = getLanguageIndex(config.fromLanguage, false)
 toComboBox.selectedItem = getLanguageIndex(config.toLanguage, false)
 
-mainContainer:draw()
-buffer.draw(true)
+mainContainer:drawOnScreen()
 mainContainer:startEventHandling()