Fixed std::string issue