This MR adds back a line in set_buffer that was dropped previously. Buffers are now set properly.
set_buffer