PMO-2800: improved equal method