Going with the new fixes