Fixed bug (switch case)