Fixed c_str handling