Tag bug fixed