Fix #1705