Client stop command fix