Bugfix Export functionality