2234: fixing