Fixed issue with the string buffers