fixup:
- holder for next buffer
- use correct offset for full check