#59 - remove wrapper optimisation for Buffer