Fix #1754