-- fixed for UCCPAR-353