diff --git a/src/aiori-CEPHFS.c b/src/aiori-CEPHFS.c
index 0d38901..27f12db 100755
--- a/src/aiori-CEPHFS.c
+++ b/src/aiori-CEPHFS.c
@@ -173,7 +173,15 @@ static void CEPHFS_Init()
 static void CEPHFS_Final()
 {
         /* shutdown */
-        ceph_shutdown(cmount);
+        int ret = ceph_unmount(cmount);
+        if (ret < 0) {
+		CEPHFS_ERR("ceph_umount failed", ret);
+	}
+        ret = ceph_release(cmount);
+        if (ret < 0) {
+                CEPHFS_ERR("ceph_release failed", ret);
+        }
+	cmount = NULL;
 }
 
 static void *CEPHFS_Create(char *testFileName, IOR_param_t * param)
@@ -273,7 +281,6 @@ static void CEPHFS_Close(void *file, IOR_param_t * param)
                 CEPHFS_ERR("ceph_close failed", ret);
         }
         free(file);
-
         return;
 }