Fixed 19693 trhough changing the re_tag expression