Undo fix
Add fixed version of resolve
Oops