diff --git a/tools/python/xen/xend/server/BlktapController.py b/tools/python/xen/xend/server/BlktapController.py
index 24d96ee581..2e6c93a896 100644
--- a/tools/python/xen/xend/server/BlktapController.py
+++ b/tools/python/xen/xend/server/BlktapController.py
@@ -159,6 +159,8 @@ class BlktapController(BlkifController):
         #modify the configuration to attach as a vbd, now that the
         #device is configured.  Then continue to create the device
         config.update({'uname' : 'phy:' + device.rstrip()})
-        self.deviceClass='vbd'
 
-        return BlkifController.createDevice(self, config);
+        self.deviceClass='vbd'
+        devid = BlkifController.createDevice(self, config)
+        self.deviceClass='tap'
+        return devid