Fix #1485

See #1485