address comments
Merge pull request #1356 from marcel-blonk/PLFM-2751

address review comment