Fix for J2.5