Fixed minor issue with case switch