Some more case check