Fix for #888