Fix #5461