Bugfix
Merge pull request #988 from WS64/master

Bugfix