Fix Buffer