Fix fields creation when importing