AC: fixed for_which