Fix #1715