actually fixing what can be fixed in the PacketFactory