Fixed bug in string to buffer.
Merge branch 'fix' into dev