fixed switch statements