Fix circular event change