Fixed resolve issues.