Attempting to fix a stack-frame bug.