Simplify Resolve method

Fixes #175