Got switch() to work again