fix to add the buffer id