fixing tag stuff