Small change to packet handeling