fixed event handle wrap