Fix issue 1636
Merge pull request #397 from Zahnstocher/patch-6

Fix issue 1636