Made active steps more robust
Merge branch 'activesteps'