Fix #1734