committed the new fixes