fix mutable string error
Merge branch 'hotfix/mutable_string_error' into staging