Ooops, a break statement disappeared in the previous merge