Fix new tag behaviour