Incorporating the fix from 6855db2 into harvey.coffee