Buildfix
Merge pull request #1826 from raven02/patch-16

Buildfix