fixed handling of other_same/other_different constraint handling