Prevent sampling 2x more than requested when max_steps is set (#556)

Prevent sampling 2x more than requested when max_steps is set (#556) #80