Build fix
Merge pull request #585 from raven02/master

Build fix