Fix WRONGLY removed code