Fix for #879