Fix for #860