Added self-resolution.