Hashcode and equals fix