Buildfix
Merge pull request #1604 from raven02/patch-12

Buildfix