Fix for #95