Updated to keep up with changes to new string_buffer