fix solution structure