Forgot to check event type as well