fixed PROBLEMS