commander: missed 'break' in 'switch' added