solver bugfix_1