Fixed a join issue