diff --git a/src/device.c b/src/device.c
index 65a4630..c77119a 100644
--- a/src/device.c
+++ b/src/device.c
@@ -55,7 +55,6 @@ static void fprint_device_delete_enrolled_fingers(FprintDevice *rdev,
 						  const char *username,
 						  DBusGMethodInvocation *context);
 static void fprint_device_get_properties (FprintDevice *rdev,
-					  GHashTable **props,
 					  DBusGMethodInvocation *context);
 
 #include "device-dbus-glue.h"
@@ -1037,10 +1036,8 @@ static void fprint_device_delete_enrolled_fingers(FprintDevice *rdev,
 	dbus_g_method_return(context);
 }
 
-static void
-fprint_device_get_properties (FprintDevice *rdev,
-			      GHashTable **props,
-			      DBusGMethodInvocation *context)
+static void fprint_device_get_properties (FprintDevice *rdev,
+					  DBusGMethodInvocation *context)
 {
 	FprintDevicePrivate *priv = DEVICE_GET_PRIVATE(rdev);
 	GHashTable *table;
@@ -1053,6 +1050,6 @@ fprint_device_get_properties (FprintDevice *rdev,
 	driver_name = fp_driver_get_full_name (driver);
 	g_hash_table_insert (table, "Name", g_strdup (driver_name));
 
-	*props = table;
+	dbus_g_method_return (context, table);
 }
 
diff --git a/src/device.xml b/src/device.xml
index 31decd9..a0e07a7 100644
--- a/src/device.xml
+++ b/src/device.xml
@@ -56,6 +56,7 @@
 
 		<method name="GetProperties">
 			<arg type="a{ss}" name="properties" direction="out" />
+			<annotation name="org.freedesktop.DBus.GLib.Async" value="" />
 		</method>
 
 	</interface>