Fixed dodgy event