Make sure last chunk includes remainder