#466 - Update  stop function for