Root router fix - #47