Switch case fixed