Fix target override as it doesn't work when the target import order changes.#977