The pattern matching in the last commit was wrong.