Hashtable bugfix