Bugfix
Added join