fixed fix_state
Merge branch 'feature/add_state_machine-45' into staging