review (and fix) the way we retrieve the subject object