Fixed missing Eq constraint.
Merged other fix.