Improved worker returning on FSM's