Render issue fix(event)