diff --git a/src/compiler.cpp b/src/compiler.cpp
index 08f65d4904..608efd88ac 100644
--- a/src/compiler.cpp
+++ b/src/compiler.cpp
@@ -666,9 +666,7 @@ offsetToFrameIndex(Context* c, unsigned offset)
 {
   unsigned normalizedOffset = offset / BytesPerWord;
 
-  return ((normalizedOffset
-           >= usableFrameSize(c)
-           + c->arch->frameFooterSize()) ?
+  return ((normalizedOffset >= c->alignedFrameSize) ?
           (normalizedOffset
            - (c->arch->frameFooterSize() * 2)
            - c->arch->frameHeaderSize()) :