Fix #84, accidentally not using the patch in that bug.