Fixes event passing