further changes to fix performance issue introduced in change to gaxb