dup of line 170
Merge pull request #2858 from wlbksy/patch-1

dup of line 170