fix for GCp-8361