add fix for  #60560 into upgrading