Fixed GenericType check