Fix bug for Join project