Fix #16064