Attempt to fix tags system