Correct resoulution with resolution. (cherry picked from commit b838bc11)
mentioned in commit c24da2df