3 files changed, 13 insertions, 4 deletions
diff --git a/gui.js b/gui.js
index 2456277..04481cc 100644
--- a/gui.js
+++ b/gui.js
@@ -69,7 +69,7 @@ SpeechBubbleMorph*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.gui = '2014-October-02';
+modules.gui = '2014-October-06';
 
 // Declarations
 
@@ -3354,6 +3354,7 @@ IDE_Morph.prototype.toggleStageSize = function (isSmall) {
             myself.stageRatio += (1 - myself.stageRatio) / 2;
             myself.setExtent(world.extent());
             if (myself.stageRatio > 0.9) {
+                myself.stageRatio = 1;
                 myself.isSmallStage = false;
                 myself.setExtent(world.extent());
                 myself.controlBar.stageSizeButton.refresh();
diff --git a/history.txt b/history.txt
index 00dc07e..5999536 100755
--- a/history.txt
+++ b/history.txt
@@ -2301,3 +2301,7 @@ ______
 141002
 ------
 * GUI: New feature - minimal stage mode (shift-click on small-stage button)
+
+141006
+------
+* GUI, Objects: fixed #604. Thanks, @Gubolin!
diff --git a/objects.js b/objects.js
index 905b3d1..17450dd 100644
--- a/objects.js
+++ b/objects.js
@@ -125,7 +125,7 @@ PrototypeHatBlockMorph*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.objects = '2014-October-01';
+modules.objects = '2014-October-06';
 
 var SpriteMorph;
 var StageMorph;
@@ -4378,8 +4378,12 @@ StageMorph.prototype.drawOn = function (aCanvas, aRect) {
         );
 
         // pen trails
-        ws = w / this.scale;
-        hs = h / this.scale;
+        ws = Math.floor(
+            Math.min(w / this.scale, this.image.width * this.scale)
+        );
+        hs = Math.floor(
+            Math.min(h / this.scale, this.image.height * this.scale)
+        );
         context.save();
         context.scale(this.scale, this.scale);
         context.drawImage(