Perhaps the best of all possible fixes