bug fix in buffer storage mechanics