fix possible issue with export
fix possible issue with export