Fix #561
Merge pull request #562 from dapil/patch-1

Fix #561