Fixed tagging bug