Fixing wrong tags