Attempt to fix tags