Buildfix
Merge pull request #1303 from raven02/patch-20

Buildfix