Make sure this works on J2.5