Revert previous changes and do it the correct way
in hashCode() function