Fix switch statement fall through