Fix #1686