changes to work with bug 1032731