Fix #1659