Fix Invoker to push and pop call stack items