Fix buffered items issue