fixed Unresovled issues.