message buffers corrected