Fixed Switch Statement