Fix bug found by tridge in 2.2.x. Ensure that %U substitution is