Fix #1485