Fix #3454.