HashValue bug eliminated