Removed unnecessary case check