Fix J2.5 error for #90