Fix stack pop error
Fix hardcoded stack location problem