diff --git a/manifests/init.pp b/manifests/init.pp
index b099a2266..15bf5342f 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -34,7 +34,7 @@
   $write_threads                                                      = $collectd::params::write_threads,
 ) inherits collectd::params {
 
-  $collectd_version_real = pick($::collectd_version, $minimum_version)
+  $collectd_version_real = pick_default($facts['collectd_version'], $minimum_version)
 
   class { '::collectd::install':
     package_install_options => $package_install_options,
diff --git a/manifests/params.pp b/manifests/params.pp
index 83d01b692..f04e69b0f 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -135,5 +135,5 @@
   }
 
   # Override with custom fact value (present only if python is installed)
-  $python_dir            = pick($::python_dir, $default_python_dir)
+  $python_dir = pick($facts['python_dir'], $default_python_dir)
 }