Buildfix
Merge pull request #2874 from raven02/patch-3

Buildfix