Tagging bug Fixed