Fix hashcode & equals