Fix #1683

See #1683