diff --git a/VersionASM b/VersionASM
index 5d34d2e62aaec6a8dcaf881e1db19f8a19fd8c2f..8c635c436004f20f477c2f7d4d9ce0e377ee839d 100644
--- a/VersionASM
+++ b/VersionASM
@@ -11,13 +11,13 @@
                         GBLS    Module_HelpVersion
                         GBLS    Module_ComponentName
                         GBLS    Module_ComponentPath
-Module_MajorVersion     SETS    "5.20"
-Module_Version          SETA    520
+Module_MajorVersion     SETS    "5.21"
+Module_Version          SETA    521
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "28 Mar 2013"
-Module_ApplicationDate  SETS    "28-Mar-13"
+Module_Date             SETS    "31 Mar 2013"
+Module_ApplicationDate  SETS    "31-Mar-13"
 Module_ComponentName    SETS    "Wimp"
 Module_ComponentPath    SETS    "castle/RiscOS/Sources/Desktop/Wimp"
-Module_FullVersion      SETS    "5.20"
-Module_HelpVersion      SETS    "5.20 (28 Mar 2013)"
+Module_FullVersion      SETS    "5.21"
+Module_HelpVersion      SETS    "5.21 (31 Mar 2013)"
                         END
diff --git a/VersionNum b/VersionNum
index 83c46cc67fe8d02719c1e5592bd4310d1145db81..b8860bfe2cefef88889a6ccbaf94bd43d72c5a43 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,23 +1,23 @@
-/* (5.20)
+/* (5.21)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        5.20
+#define Module_MajorVersion_CMHG        5.21
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                28 Mar 2013
+#define Module_Date_CMHG                31 Mar 2013
 
-#define Module_MajorVersion             "5.20"
-#define Module_Version                  520
+#define Module_MajorVersion             "5.21"
+#define Module_Version                  521
 #define Module_MinorVersion             ""
-#define Module_Date                     "28 Mar 2013"
+#define Module_Date                     "31 Mar 2013"
 
-#define Module_ApplicationDate          "28-Mar-13"
+#define Module_ApplicationDate          "31-Mar-13"
 
 #define Module_ComponentName            "Wimp"
 #define Module_ComponentPath            "castle/RiscOS/Sources/Desktop/Wimp"
 
-#define Module_FullVersion              "5.20"
-#define Module_HelpVersion              "5.20 (28 Mar 2013)"
-#define Module_LibraryVersionInfo       "5:20"
+#define Module_FullVersion              "5.21"
+#define Module_HelpVersion              "5.21 (31 Mar 2013)"
+#define Module_LibraryVersionInfo       "5:21"
diff --git a/s/Wimp10 b/s/Wimp10
index 525506a545c01c11cd713866849ccac5fc154a50..bc7de6222d15254095e440f93f7f6203748f9f76 100644
--- a/s/Wimp10
+++ b/s/Wimp10
@@ -3182,7 +3182,11 @@ cachetoolspritedata
         Pull    "R0-R3,R5"
 
 10      MOV     R4,#0                   ; R4 =0 read table size
+      [ TrueIcon3
+        SWI     XColourTrans_GenerateTable ; ensure wide table flag is obeyed
+      |
         SWI     XColourTrans_SelectTable
+      ]
         BVS     %FT90                   ; exit
 
         LDR     R14,tpixtable_at