first pass
Fix for test
Merge pull request #699 from john-hill/PLFM-2199

first pass