Bug fix and adding missing tag