Nice catch. It substitution generally works, but yes, it's not wired up to the noun in the system messages properly.
