Fix change to before_step API