* fix solution structure