Fixing equals()