Fix #1797