Fixing tags problem