Fix #561
Merge pull request #564 from wbmrcb/issue561

Fix #561