Fix last commit in a better way