2nd attempt to fix tags