Fix a bug with missing tags