FIX adhoc setup