Bug fix in step model