Fix #5513