Fix tag / comment issue