fixes #1 (finally) and minor other bugs, where resolve was not triggered