Fix unmarshalling during importing