Fix #1689