Commutative solver seems to be fixed