Fix #1455

See #1455