Fix #1724