Fix after merge (sic!)