PB-661 #comment bug fixed in stopping alarm.