Statemachine runner fix