Restoring changes dure to another fix