fix up solution 1