Fix joins with belongs_to association