[IMP] fields: improve code in former commit