fixed event manager

but only a little