bug fix for MaxTimeSteps > 1