Fix solution as well