fix fields check