Fix fields