New improved fix script