Fix for #32