diff --git a/custom/lib/facter/homename.rb b/custom/lib/facter/homename.rb
index eb773e2..9e40597 100644
--- a/custom/lib/facter/homename.rb
+++ b/custom/lib/facter/homename.rb
@@ -2,7 +2,9 @@ require 'puppet'
 
 Facter.add('homename') do
     setcode do
-        Puppet.parse_config
+        if Facter.value('puppetversion').to_i < 3
+            Puppet.parse_config
+        end
         Puppet.settings.value('certname')
     end
 end
diff --git a/custom/lib/facter/puppet_ssldir.rb b/custom/lib/facter/puppet_ssldir.rb
index 202301c..734e62d 100644
--- a/custom/lib/facter/puppet_ssldir.rb
+++ b/custom/lib/facter/puppet_ssldir.rb
@@ -2,7 +2,9 @@ require 'puppet'
 
 Facter.add('puppet_ssldir') do
     setcode do
-	Puppet.parse_config
-	Puppet.settings.value('ssldir')
+        if Facter.value('puppetversion').to_i < 3
+            Puppet.parse_config
+        end
+        Puppet.settings.value('ssldir')
     end
 end