Build fix
Merge pull request #998 from john-hill/PLFM-2498

Build fix