fix merge comments from #528
Merge pull request #580 from opdemand/merge-fixes-from-528

fix merge comments from #528