Hopefully fixes issue #143

@balupton please change this link if it's incorrect. :)