fix join
3 files changed