[Fixes  #52921931]