Fixed buffer some more