Fix merge error
Merge pull request #804 from garvankeeley/fixbuild

Fix merge error