diff --git a/src/libcalamares/PythonHelper.cpp b/src/libcalamares/PythonHelper.cpp
index bb698ba55..ab5802076 100644
--- a/src/libcalamares/PythonHelper.cpp
+++ b/src/libcalamares/PythonHelper.cpp
@@ -233,7 +233,7 @@ Helper::~Helper()
 {}
 
 
-boost::python::object
+boost::python::dict
 Helper::createCleanNamespace()
 {
     // To make sure we run each script with a clean namespace, we only fetch the
diff --git a/src/libcalamares/PythonHelper.h b/src/libcalamares/PythonHelper.h
index a77ab80b2..be1ab8544 100644
--- a/src/libcalamares/PythonHelper.h
+++ b/src/libcalamares/PythonHelper.h
@@ -51,7 +51,7 @@ public:
     explicit Helper( QObject* parent = nullptr );
     virtual ~Helper();
 
-    boost::python::object createCleanNamespace();
+    boost::python::dict createCleanNamespace();
 
     QString handleLastError();
 
diff --git a/src/libcalamares/PythonJob.cpp b/src/libcalamares/PythonJob.cpp
index 1a8a9701a..006fd86b6 100644
--- a/src/libcalamares/PythonJob.cpp
+++ b/src/libcalamares/PythonJob.cpp
@@ -216,10 +216,10 @@ BOOST_PYTHON_MODULE( libcalamares )
         "in the original string."
     );
 
-    
-    bp::def( 
-        "gettext_languages", 
-        &CalamaresPython::gettext_languages, 
+
+    bp::def(
+        "gettext_languages",
+        &CalamaresPython::gettext_languages,
         "Returns list of languages (most to least-specific) for gettext."
     );
 
@@ -296,7 +296,7 @@ PythonJob::exec()
 
     try
     {
-        bp::object scriptNamespace = helper()->createCleanNamespace();
+        bp::dict scriptNamespace = helper()->createCleanNamespace();
 
         bp::object calamaresModule = bp::import( "libcalamares" );
         bp::dict calamaresNamespace = bp::extract< bp::dict >( calamaresModule.attr( "__dict__" ) );
@@ -310,7 +310,7 @@ PythonJob::exec()
                                            scriptNamespace );
 
         bp::object entryPoint = scriptNamespace[ "run" ];
-        bp::object prettyNameFunc = bp::getattr(scriptNamespace, "pretty_name", bp::object());
+        bp::object prettyNameFunc = scriptNamespace.get("pretty_name", bp::object());
 
         cDebug() << "Job file" << scriptFI.absoluteFilePath();
         if ( !prettyNameFunc.is_none() )