- fix join