Fixed equals() method