Fix #1745