Tweak fix for #32.