Restructure code a bit.
Don't join until identified.