Fix msg buf(hopefully)