Fix the previous issue for unknown tags as well