Fix JoinHanler