Insert events fix