Fixed joining on null