You removed the %s but kept the '% branch'. Is that intentional?