Buildfix
Merge pull request #1572 from raven02/patch-10

Buildfix