fixed import/export roundtrip issues