Make `this` logical in events