finally fixed tags