Fix #1627