Bug on editing events