actually fix import-export this time