Fix issue with join model