More consistent handling of last commit