Merge "Fix bug in isEquivalent()"