- Fix regression breaking import/export