fixing the problems