Fixed bug where resolve was returned without an option monad.