Fix regression #1741