M/graceful stop fix