Resolve
Merge pull request #51 from camael24/b/resolve

Use resolve() only where needed.