Buffer fix
Fixing Buffer