diff --git a/lang/cs/Org.Apache.REEF.IO/Files/DefaultDirectoryInfo.cs b/lang/cs/Org.Apache.REEF.IO/Files/DefaultDirectoryInfo.cs
index 47a86fe..29011a8 100644
--- a/lang/cs/Org.Apache.REEF.IO/Files/DefaultDirectoryInfo.cs
+++ b/lang/cs/Org.Apache.REEF.IO/Files/DefaultDirectoryInfo.cs
@@ -180,7 +180,8 @@
         /// </summary>
         public void Create(DirectorySecurity directorySecurity)
         {
-            _directoryInfo.Create(directorySecurity);
+            _directoryInfo.Create();
+            _directoryInfo.SetAccessControl(directorySecurity);
         }
 
         /// <summary>
@@ -196,7 +197,9 @@
         /// </summary>
         public IDirectoryInfo CreateSubdirectory(string path, DirectorySecurity directorySecurity)
         {
-            return FromDirectoryInfo(_directoryInfo.CreateSubdirectory(path, directorySecurity));
+            var directoryInfo = CreateSubdirectory(path);
+            directoryInfo.SetAccessControl(directorySecurity);
+            return directoryInfo;
         }
 
         /// <summary>
