Fix event receiver