fixed + problem fully