forgot break in switch again...