fixed stop_after_current (buf #1062)