Fixed issue with buffer and sequential messages lost