Fix #1466

See #1466