Fix #18428