Fix #1622