fix #3515
Merge pull request #1260 from DasTestament/master