Fix resolver step