build-fix
Merge pull request #676 from john-hill/build-fix

build-fix