fix strings.
Merge branch 'fix/strings' into develop