Fix resolve

Fixes #28