fixed ISSUES