Fix resolver