Bugfix import/export