fixed consecutive events issue