Fix #1480