Fix #1639