Fix #1497