fixxed bug with tags