5c -- Switch statement patch