Network Controller fix