Merge pull request #815 from abarth/build_fix

Fix build