Fix hashCode handling