Fixed switch statement