Fix for cases where steps is less than expected