diff --git a/sources/GameModes/GameMode.uc b/sources/GameModes/GameMode.uc
index 6e37490..7c869be 100644
--- a/sources/GameModes/GameMode.uc
+++ b/sources/GameModes/GameMode.uc
@@ -167,13 +167,13 @@ public function ReportBadOptions()
 }
 
 /**
- *  @return Server options as key-value pairs in an `AssociativeArray`.
+ *  @return Server options as key-value pairs in an `HashTable`.
  */
-public function AssociativeArray GetOptions()
+public function HashTable GetOptions()
 {
-    local int               i;
-    local AssociativeArray  result;
-    result = _.collections.EmptyAssociativeArray();
+    local int       i;
+    local HashTable result;
+    result = _.collections.EmptyHashTable();
     for (i = 0; i < option.length; i += 1)
     {
         if (!ValidateServerURLName(option[i].key))      continue;
diff --git a/sources/VotingHandlerAdapter.uc b/sources/VotingHandlerAdapter.uc
index 04be56f..bb73010 100644
--- a/sources/VotingHandlerAdapter.uc
+++ b/sources/VotingHandlerAdapter.uc
@@ -170,19 +170,18 @@ private function string BuildOptionsString(GameMode gameMode)
     local string                result;
     local string                nextKey, nextValue;
     local CollectionIterator    iter;
-    local AssociativeArray      options;
+    local HashTable             options;
     options = gameMode.GetOptions();
     for (iter = options.Iterate(); !iter.HasFinished(); iter.Next())
     {
-        nextKey     = Text(iter.GetKey()).ToString();
-        nextValue   = Text(iter.Get()).ToString();
+        nextKey     = _.text.ToString(Text(iter.GetKey()));
+        nextValue   = _.text.ToString(Text(iter.Get()));
         if (optionWasAdded) {
             result $= "?";
         }
         result $= (nextKey $ "=" $ nextValue);
         optionWasAdded = true;
     }
-    options.Empty(true);
     options.FreeSelf();
     iter.FreeSelf();
     return result;