Fix previous commit some more