Attempt to fix export issue