Fixing Tag creator