Fix event loading