Update stop function for #466