Bugfix/buffer upgrade