BS-10877
Fix in equals method