fixed wrong expression index after event handler expressions