Fix system tag