joins fixes