This only needs to be done in the non-join (else  block) below.