Fix #1849

- Fix #1849