Fix #1654

See #1654