Fix to step tracker