pcm-385
Merge pull request #85 from redhataccess/pcm-385

pcm-385
fix for PCM-380 & PCM-381