Correct resoulution with resolution. (cherry picked from commit b838bc11) (cherry picked from commit 5ea3ec8e)