diff --git a/src/gba/GBAinline.h b/src/gba/GBAinline.h
index 9ef71d73..fa7d0d38 100644
--- a/src/gba/GBAinline.h
+++ b/src/gba/GBAinline.h
@@ -149,9 +149,8 @@ unreadable:
 	break;
   }
 
-  if(address & 3) {
+  if(oldAddress & 3) {
 #ifdef C_CORE
-    int shift = (address & 3) << 3;
     value = (value >> shift) | (value << (32 - shift));
 #else
 #ifdef __GNUC__