clientEventHandler condition fixed