New fix around variable tcp header size