Fixed weird switch