some more packet fixing