Don't pass intrinsic types to convert() (e.g. int.class)

Don't pass intrinsic types to convert() (e.g. int.class) #1737