No network crash :bug: fix