fix extension, fix resolver