fix resolve problem