Very likely fix of #1628