Fix #1629