COOPR-660: improve field check