Fix #1683