fix resolver