fix joins
3 files changed