Eclipselink integration fix