diff --git a/bob/bio/face/test/test_databases.py b/bob/bio/face/test/test_databases.py
index 79cb3114b9523c0e46b3ddb13b9a3824c8d29aa1..fbebbfbe98ccacaf1ce36fe3a8842d1575c4cb69 100644
--- a/bob/bio/face/test/test_databases.py
+++ b/bob/bio/face/test/test_databases.py
@@ -34,7 +34,7 @@ def _check_database(database, groups = ('dev',), protocol = None, training_depen
   if protocol: database.protocol = protocol
   assert len(database.all_files()) > 0
   assert len(database.training_files('train_extractor')) > 0
-  assert len(database.training_files('train_enroller', arrange_by_client = True)) > 0
+  assert len(database.arrange_by_client(database.training_files('train_enroller'))) > 0
 
   for group in groups:
     model_ids = database.model_ids(group)
diff --git a/setup.py b/setup.py
index 0aaec84932808e55c8049bc5860af65e6649a21e..29b84572b09f429761f9d9862e33f4e0836889c0 100644
--- a/setup.py
+++ b/setup.py
@@ -62,6 +62,7 @@ setup(
     # This line is required for any distutils based packaging.
     packages = find_packages(),
     include_package_data = True,
+    zip_safe=False,
 
     # This line defines which packages should be installed when you "install"
     # this package. All packages that are mentioned here, but are not installed
diff --git a/version.txt b/version.txt
index 0ac9c2deea58aac769c1c554458c3c8bc8e982ff..0d0f1af82bee4308f9e49b2adb6e4aa498bda98a 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-2.0.3b0
\ No newline at end of file
+2.0.4b0
\ No newline at end of file