Hack for adhoc networks

Change-Id: I43ff7beaa4057033169a9f6e935df33a524dc008