join/leave handlers fix