Fix export handler