fix for PLFM-2108
Merge pull request #608 from john-hill/PLFM-2108

fix for PLFM-2108