Fix regression #234