Bug fix and tagit