Fix #1702