correct state from stack

Fix the stack of states so that the current state is functioning after popping the previous