Fix solution structure