Fix #1671