Fixed object definition resolution.