Fix the tag creation