Network handler tweak