Fix pull request #2007
Merge pull request #2118 from ibuclaw/fix2007

Fix pull request #2007