Improves INVOKE state machine code

Improves INVOKE state machine code #154