addressed
Merge pull request #1007 from john-hill/PLFM-2512

done