fix 16405e8, update #1772
NEXT: [GH-1772] for 1.19.2