Fixed up solution