Better fix for #8976 that takes care of both, conj and conj!