fixed the problems