fixed problems with export