- Fixed double Tag bug