fixes #3713
Merge pull request #1247 from DasTestament/master