diff --git a/VersionASM b/VersionASM
index 4fa41a926f6b0252a9c71f61c639fd7ff6ed9e8b..00c857d71435c2a5bf2fae7ce1a81f923bb05cc4 100644
--- a/VersionASM
+++ b/VersionASM
@@ -5,8 +5,8 @@
 			GBLA    Module_Version
 			GBLS	Module_MinorVersion
 			GBLS	Module_Date
-Module_MajorVersion	SETS    "4.16"
-Module_Version          SETA    416
+Module_MajorVersion	SETS    "4.17"
+Module_Version          SETA    417
 Module_MinorVersion	SETS	""
-Module_Date		SETS    "17 Mar 1999"
+Module_Date		SETS    "25 Mar 1999"
 		        END
diff --git a/VersionNum b/VersionNum
index f58f0de16bdeee50b82a6c84775151f511261c1c..6c8f9ab92520eec5887368e013a2f215328f7f80 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,14 +1,14 @@
-/* (4.16)
+/* (4.17)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  *
  */
-#define Module_MajorVersion_CMHG     	4.16
+#define Module_MajorVersion_CMHG     	4.17
 #define Module_MinorVersion_CMHG	
-#define Module_Date_CMHG      		17 Mar 1999
+#define Module_Date_CMHG      		25 Mar 1999
 
-#define Module_MajorVersion     	"4.16"
-#define Module_Version                  416
+#define Module_MajorVersion     	"4.17"
+#define Module_Version                  417
 #define Module_MinorVersion		""
-#define Module_Date      		"17 Mar 1999"
+#define Module_Date      		"25 Mar 1999"
 
diff --git a/s/Wimp07 b/s/Wimp07
index 3cebde5b7476ae47ad12ef511392c170a0bb9b32..e180caa14da6399fd5b1ac7b2c82e020f9d22282 100644
--- a/s/Wimp07
+++ b/s/Wimp07
@@ -1735,11 +1735,9 @@ finisherror
       [ NCErrorBox
         Push    "r0-r2"
         MOV     R0, #0                  ; Unconditionally turn off IconHigh
-        SWI     XIconHigh_Stop
-        ADRL    R14, ptrshlflag
-        MOV     R0, #106
-        LDR     R1, [R14]
-        SWI     XOS_Byte                ; Restore pointer to the way it was after Hourglass_Smash
+        SWI XIconHigh_Stop
+	; SJM 25Mar99 Do not restore the pointer shape here
+	; anymore now that we have Wimp_Extend support
         Pull    "r0-r2"
       ]
 ;