Ugly fix for ambiguous network association