fix for PLFM-2079
code review tests
code review tests2
Merge pull request #588 from john-hill/PLFM-2079

fix for PLFM-2079