change to std::stoi()
fix some