Fix bug with new tags