Fixed crach on new Tag