fix the issues.