Temporarily fix tag parsing