Try to do the previous commit in a more compatible way.