Fix last commit

Actually do the changes from the review ... pushed old version of the
patch :/