Fix export too