Fix event trigger joining