Added proper 'step' variable - fixed mess-q issue