Fix up last commit properly