--- a/DisplaySurface.st	Wed Nov 23 21:12:49 2016 +0100
+++ b/DisplaySurface.st	Wed Nov 23 21:13:19 2016 +0100
@@ -16,7 +16,7 @@
 GraphicsMedium subclass:#DisplaySurface
 	instanceVariableNames:'viewBackground cursor eventMask moreAttributes renderer uuid
 		backed flags delegate updateRegion'
-	classVariableNames:'SaveUnderFlagMask GotExposeFlagMask'
+	classVariableNames:'GotExposeFlagMask SaveUnderFlagMask'
 	poolDictionaries:''
 	category:'Graphics-Support'
 !
@@ -519,12 +519,16 @@
     |savedCursor|
 
     cursor == aCursor ifTrue:[
-	^ aBlock value
+        ^ aBlock value
     ].
 
     savedCursor := cursor.
-    self cursor:aCursor now:true.
-    ^ aBlock ensure:[self cursor:savedCursor now:true]
+    ^ [
+        self cursor:aCursor now:true.
+        aBlock value
+    ] ensure:[
+        self cursor:savedCursor now:true
+    ]
 
     "Modified: 27.2.1997 / 17:20:43 / cg"
 !