Fixing bugs in solver: 6