BATCHEE-133 fix remote stop