Changes to assay model, fixed issue 20767