Buffer fix