Fix switch case duplication