diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/FilesystemContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/FilesystemContainer.java
index 393cd86bc63..d862027c26f 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/FilesystemContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/FilesystemContainer.java
@@ -376,8 +376,7 @@ public boolean containsId(Object itemId) {
         // Try to match all roots
         for (File root : roots) {
             try {
-                val |= ((File) itemId).getCanonicalPath()
-                        .startsWith(root.getCanonicalPath());
+                val |= ((File) itemId).getCanonicalFile().toPath().startsWith(root.getCanonicalFile().toPath());
             } catch (final IOException e) {
                 // Exception ignored
             }