Small fix to the NewStateMachine