fix event proxy logic