Fixed to return hashtable delegate