Possible fix for issue 2005
Merge pull request #207 from flerda/x

Possible fix for issue 2005