diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index 18dfa0341..42d3c90d1 100644
--- a/sc2/ChangeLog
+++ b/sc2/ChangeLog
@@ -1,4 +1,5 @@
 Changes towards version 0.7:
+- Allow reaching 999.9:999.9 in HyperSpace (bug #628), from Nic
 - Use system getopt_long() when available - SvdB
 - Added --addondir commandline option - Mika
 - Case insensitive matching when looking for .zip/.uqm/.rmp files - SvdB
diff --git a/sc2/src/sc2code/units.h b/sc2/src/sc2code/units.h
index 72fc08047..fbc76280b 100644
--- a/sc2/src/sc2code/units.h
+++ b/sc2/src/sc2code/units.h
@@ -76,11 +76,11 @@ extern int ScreenHeight;
 #define MAX_Y_UNIVERSE 9999
 #define MAX_X_LOGICAL \
 		((UNIVERSE_TO_LOGX (MAX_X_UNIVERSE + 1) > UNIVERSE_TO_LOGX (-1) ? \
-				UNIVERSE_TO_LOGX (MAX_X_UNIVERSE) : UNIVERSE_TO_LOGX (-1)) \
+				UNIVERSE_TO_LOGX (MAX_X_UNIVERSE + 1) : UNIVERSE_TO_LOGX (-1)) \
 				- 1L)
 #define MAX_Y_LOGICAL \
 		((UNIVERSE_TO_LOGY (MAX_Y_UNIVERSE + 1) > UNIVERSE_TO_LOGY (-1) ? \
-				UNIVERSE_TO_LOGY (MAX_Y_UNIVERSE) : UNIVERSE_TO_LOGY (-1)) \
+				UNIVERSE_TO_LOGY (MAX_Y_UNIVERSE + 1) : UNIVERSE_TO_LOGY (-1)) \
 				- 1L)
 #define SECTOR_WIDTH 195
 #define SECTOR_HEIGHT 25