Fix #16880: another one