Isn't this the only fix required?