Correctly retain buffer