Export was broken due to ARP changes, fixed