Forgot re-enable backward compatibility with old event callbacks