Fix #1737