Fix #1473.