Fix #5454