1 files changed, 5 insertions, 8 deletions

diff --git a/boxes.cpp b/boxes.cpp
index 72a4c6c9b0..9135ee8498 100644
--- a/boxes.cpp
+++ b/boxes.cpp
@@ -43,15 +43,12 @@ byte Scumm::getNumBoxes() {
 }
 
 Box *Scumm::getBoxBaseAddr(int box) {
-	byte *ptr;
-
-    if(_features & GF_SMALL_HEADER)
-		ptr = getResourceAddress(rtMatrix, 1);
-    else
-		ptr = getResourceAddress(rtMatrix, 2);
-
+        byte *ptr = getResourceAddress(rtMatrix, 2);
 	checkRange(ptr[0]-1, 0, box, "Illegal box %d");
-	return (Box*)(ptr + box*SIZEOF_BOX + 2);
+	if(_features & GF_SMALL_HEADER)
+		return (Box*)(ptr + box*SIZEOF_BOX + 1);
+	else
+		return (Box*)(ptr + box*SIZEOF_BOX + 2);
 }
 
 bool Scumm::checkXYInBoxBounds(int b, int x, int y) {