Fix not jumping into correct state after wakeup