Fixed to_string issue