Fix #1607