selfcheck2 fix: add a race-condition fix to the adhoc path which was
added to the non-adhoc path a while ago.