Fix #1849