Fixed index added scoping for events