Fix #1663