Fix for #237