Fix in fields check