Rebuilt with latest master branch

Encountered a compile error. Not sure if my fix is the right thing though.