Fix #1698