[ ! ] Last pop and push fixes