Fixed using of remove event