diff --git a/common/board.c b/common/board.c
index c9c2ed391..1bf1d1af1 100644
--- a/common/board.c
+++ b/common/board.c
@@ -208,7 +208,7 @@ board_makeFromStream( MPFORMAL XWStreamCtxt* stream, ModelCtxt* model,
 #endif
 
 #ifdef XWFEATURE_SEARCHLIMIT
-        if ( stream_getVersion( stream ) >= CUR_STREAM_VERS ) {
+        if ( stream_getVersion( stream ) >= STREAM_VERS_41b4 ) {
             board->hasHintRect[i] = stream_getBits( stream, 1 );
         } else {
             board->hasHintRect[i] = XP_FALSE;
diff --git a/common/game.c b/common/game.c
index e660514bf..bd67b9a9e 100644
--- a/common/game.c
+++ b/common/game.c
@@ -380,19 +380,14 @@ gi_readFromStream( MPFORMAL XWStreamCtxt* stream, CurGameInfo* gi )
     gi->phoniesAction = (XWPhoniesChoice)stream_getBits( stream, 2 );
     gi->timerEnabled = stream_getBits( stream, 1 );
 
-    if ( strVersion >= CUR_STREAM_VERS ) {
+    if ( strVersion >= STREAM_VERS_41b4 ) {
         gi->allowPickTiles = stream_getBits( stream, 1 );
-    } else {
-        gi->allowPickTiles = XP_FALSE;
-    }
-
-    if ( strVersion >= CUR_STREAM_VERS ) {
         gi->allowHintRect = stream_getBits( stream, 1 );
     } else {
+        gi->allowPickTiles = XP_FALSE;
         gi->allowHintRect = XP_FALSE;
     }
 
-
     gi->gameID = stream_getU16( stream );
     if ( gi->timerEnabled ) {
         gi->gameSeconds = stream_getU16( stream );
diff --git a/common/game.h b/common/game.h
index c68c01c15..2b13446f7 100644
--- a/common/game.h
+++ b/common/game.h
@@ -32,7 +32,7 @@ extern "C" {
 
 #define CUR_STREAM_VERS  0x03
 
-#define STREAM_VERS_41   0x02
+#define STREAM_VERS_41b4 0x02
 #define STREAM_VERS_405  0x01
 
 typedef struct LocalPlayer {
diff --git a/common/server.c b/common/server.c
index f2ac6dab1..8a6f74bb8 100644
--- a/common/server.c
+++ b/common/server.c
@@ -236,7 +236,7 @@ getNV( XWStreamCtxt* stream, ServerNonvolatiles* nv, XP_U16 nPlayers )
     (void)stream_getBits( stream, 3 ); /* was npassesinrow */
 
     nv->nDevices = (XP_U8)stream_getBits( stream, NDEVICES_NBITS );
-    if ( stream_getVersion( stream ) > STREAM_VERS_41 ) {
+    if ( stream_getVersion( stream ) > STREAM_VERS_41b4 ) {
         ++nv->nDevices;
     }