Attempt to improve export performance