Fix for #911