Fix fields check