-- fixed for UCCPAR-353
Merge pull request #13 from pradpnayak/UCCPAR-353

-- fixed for UCCPAR-353