More consistent handling of last commit 2