diff --git a/src/whois.gtld.php b/src/whois.gtld.php
index d5d5a77..83dfd63 100644
--- a/src/whois.gtld.php
+++ b/src/whois.gtld.php
@@ -54,7 +54,7 @@ class gtld_handler extends WhoisClient
 	function parse($data, $query)
 		{
 		$this->Query = array();
-		$this->SUBVERSION = sprintf('%s-%s', $query['handler'], $this->HANDLER_VERSION);
+		$this->SUBVERSION = sprintf('%s-%s', get_class($this), $this->HANDLER_VERSION);
 		$this->result = generic_parser_b($data['rawdata'], $this->REG_FIELDS, 'dmy');
 
 		unset($this->result['registered']);