LP1779158 Import field id/class mismatch fix