Fixing tag bug