WJE_DISTINGUISH_INTEGER_TYPE related fix