Fix PR19819