Merge pull request #47 from pradpnayak/UCCPAR-431

-- UCCPAR-431, fixed #a from https://jmaconsulting.jira.com/browse/UCCPA...
UCCPAR-431