Fix #1457

See #1457