Fixed mutable string issue