fixed late join issues, and null on event