Fix issue 326
Merge pull request #408 from egbertbouman/issue326

Fix issue 326