Fix build issue caused by #16731