Fix fields matching