Trying to avoid problems with the stop command.