Fix after massive commit #2