Fix export bug