Fix #5789