Temporarily fix issue #134 until h31ix gets around to it.