Fixing event indices to not run over the end.