Fix #1658