Fixed setup for empty network
Merged