diff --git a/recipes/server.rb b/recipes/server.rb
index 5b96a14..54aaf08 100644
--- a/recipes/server.rb
+++ b/recipes/server.rb
@@ -116,7 +116,9 @@ if freeipa_masters.empty? then
 
   node.set[:freeipa][:master] = true
 
-elsif (node[:freeipa][:master].nil? && node[:freeipa][:master] == false) && (node[:freeipa][:replica].nil? && node[:freeipa][:replica] == false) then
+#elsif (node[:freeipa][:master].nil? && node[:freeipa][:master] == false) && (node[:freeipa][:replica].nil? && node[:freeipa][:replica] == false) then
+elsif (node[:freeipa][:master] && node[:freeipa][:master].respond_to?(:value) && node[:freeipa][:master] == false) &&
+      (node[:freeipa][:replica] && node[:freeipa][:replica].respond_to?(:value) && node[:freeipa][:replica] == false) then
   ### Subsequent Replica Nodes 
 
   # check to see if slave is setup to replicat from master