Fix export fix bug