Rollback on disable
Correct the active behaviour on steps
Correct the active behaviour on steps
Crappy commit