diff --git a/app/controllers/epp/domains_controller.rb b/app/controllers/epp/domains_controller.rb
index 0e5f56e42..62ada777c 100644
--- a/app/controllers/epp/domains_controller.rb
+++ b/app/controllers/epp/domains_controller.rb
@@ -173,8 +173,15 @@ module Epp
       return true if doc.document.children.empty?
       
       store = []
-      doc.document.add.children.each_with_index do |x, i|
-         store << doc.document.add.children[i].name  
+
+      if value == 'add'
+        doc.document.add.children.each_with_index do |x, i|
+          store << doc.document.add.children[i].name  
+        end
+      else
+        doc.document.rem.children.each_with_index do |x, i|
+          store << doc.document.rem.children[i].name  
+        end
       end
 
       return true if store.size == 1 and store[0] == "keyData"
@@ -184,7 +191,7 @@ module Epp
 
     def dnskey_update_enabled
       find_domain
-      
+
       if @domain.dnskey_update_enabled? && !params[:parsed_frame].css('update').empty?
 
         return if parsed_response_for_dnskey('add')
diff --git a/test/system/registrar_area/xml_consoles_test.rb b/test/system/registrar_area/xml_consoles_test.rb
index 6fe855a5b..51cc362eb 100644
--- a/test/system/registrar_area/xml_consoles_test.rb
+++ b/test/system/registrar_area/xml_consoles_test.rb
@@ -22,7 +22,7 @@ class RegistrarAreaXmlConsolesTest < ApplicationSystemTestCase
       <epp xmlns="https://epp.tld.ee/schema/epp-ee-1.0.xsd">
         <command>
           <check>
-            <domain:check xmlns:domain="https://epp.tld.ee/schema/domain-ee-1.1.xsd">
+            <domain:check xmlns:domain="https://epp.tld.ee/schema/domain-ee-1.2.xsd">
               <domain:name>auction.test</domain:name>
             </domain:check>
           </check>