fixed serverStateBuffer handling