Another fix for #32.