Fixed issue with export