diff --git a/tuned/controller.py b/tuned/controller.py
index 3ee56b1..f692726 100644
--- a/tuned/controller.py
+++ b/tuned/controller.py
@@ -95,7 +95,7 @@ class Controller(exports.interfaces.ExportableInterface):
 
 	@exports.export("", "s")
 	def active_profile(self):
-		return self._profile
+		return self._daemon.profile.name
 
 	@exports.export("", "b")
 	def status(self):
diff --git a/tuned/daemon.py b/tuned/daemon.py
index 301456b..70f70d4 100644
--- a/tuned/daemon.py
+++ b/tuned/daemon.py
@@ -41,6 +41,10 @@ class Daemon(object):
 			raise Exception("Cannot set profile while the daemon is running.")
 		self._profile = self._profile_loader.load(profile_name)
 
+	@property
+	def profile(self):
+		return self._profile
+
 	def _thread_code(self):
 		if self._profile is None:
 			raise Exception("Cannot start the daemon without setting a profile.")
@@ -113,7 +117,3 @@ class Daemon(object):
 		self._thread = None
 
 		return True
-
-	def cleanup(self):
-		# TODO: do we need it?
-		pass
diff --git a/tuned/profiles/loader.py b/tuned/profiles/loader.py
index 6ee8fc1..282b80f 100644
--- a/tuned/profiles/loader.py
+++ b/tuned/profiles/loader.py
@@ -28,7 +28,7 @@ class Loader(object):
 		return self._load_directories
 
 	def load(self, profile_names):
-		if type(profile_names) is str:
+		if type(profile_names) is not list:
 			readable_name = profile_names
 			profile_names = [profile_names]
 		else: