deal with new export mechanism for XS version