Fix Tag conversion