Fix #1849

See #1849