Fix #1682