[master] cstring "fix"