Fix for #92