Trying to fix join event