fix the return stack functions (:macro didn't work as expected)