Fixed switch case type detection