fixing tags for real