fix buffer handling