Fix #1706