Simulator network handler fix