fixing the stack location stuff