Fix #1606