bug fix - crashes on network load