Hopefully made packet chunk management more robust