fix: make self-join logic more flexible (#213)

fix: make self-join logic more flexible (#213) #52