Fix export issue