Fix problem with tag prefixes