Fix for AdHoc