diff --git a/Changes.txt b/Changes.txt
index 60d1c657c..79ae2f736 100644
--- a/Changes.txt
+++ b/Changes.txt
@@ -12,6 +12,15 @@
                                Release History
 ===========================================================================
 
+4.7.2 to 4.8: (xxx. xx, 2016)
+
+  * Fixed HMOVE positioning bug that occurred under certain circumstances.
+    Thanks to Omegamatrix of AtariAge for the bug report and patch to fix
+    the issue.
+
+-Have fun!
+
+
 4.7.1 to 4.7.2: (Mar. 25, 2016)
 
   * Fixed bug when entering and exiting the debugger; sometimes the
@@ -27,8 +36,6 @@
     remove references to obsolete compiler versions that can no longer
     be used to compile Stella.
 
--Have fun!
-
 
 4.7 to 4.7.1: (Feb. 13, 2016)
 
diff --git a/src/emucore/TIA.cxx b/src/emucore/TIA.cxx
index 1c49f091a..649af03ad 100644
--- a/src/emucore/TIA.cxx
+++ b/src/emucore/TIA.cxx
@@ -1765,6 +1765,7 @@ bool TIA::poke(uInt16 addr, uInt8 value)
             break;
         }
         myPOSP0 = newx;
+        CLAMP_POS(myPOSP0);
       }
       break;
     }
@@ -1815,6 +1816,7 @@ bool TIA::poke(uInt16 addr, uInt8 value)
             break;
         }
         myPOSP1 = newx;
+        CLAMP_POS(myPOSP1);
       }
       break;
     }
@@ -1839,6 +1841,7 @@ bool TIA::poke(uInt16 addr, uInt8 value)
       if(newx != myPOSM0)
       {
         myPOSM0 = newx;
+        CLAMP_POS(myPOSM0);
       }
       break;
     }
@@ -1863,6 +1866,7 @@ bool TIA::poke(uInt16 addr, uInt8 value)
       if(newx != myPOSM1)
       {
         myPOSM1 = newx;
+        CLAMP_POS(myPOSM1);
       }
       break;
     }