diff --git a/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/essential/distribution.py b/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/essential/distribution.py
index b9e5c6d..b6d5e4f 100644
--- a/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/essential/distribution.py
+++ b/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/essential/distribution.py
@@ -135,7 +135,7 @@ def idir(self, path):
 		for root, _, filenames in os.walk(path):
 			for f in filenames:
 				files.append(os.path.relpath(os.path.join(root, f), path))
-		return files
+		return set(files)
 
 	def genData(self, file_name, content_type, boundary, flavor):
 		"""Generates data in the form to be sent via http POST request.\n
@@ -502,8 +502,9 @@ def check_distribute(self, users):
 			path = self.getUserFilesPath(user, 'distribute')
 			print 'file_path=', path
 			existingFiles = self.idir(path)
-			print 'existingFiles=', existingFiles
-			if self.files != existingFiles:
+			print 'existingFiles=', sorted(existingFiles)
+			print '        Files=', sorted(self.files)
+			if set(self.files) != existingFiles:
 				utils.fail(
 					'Project files were not distributed for user %s' %
 					(user,))
@@ -530,8 +531,9 @@ def check_collect(self, users):
 			path = self.getUserFilesPath(user, 'collect')
 			print 'file_path=', path
 			existingFiles = self.idir(path)
-			print 'existingFiles=', existingFiles
-			if self.files != existingFiles:
+			print 'existingFiles=', sorted(existingFiles)
+			print '        Files=', sorted(self.files)
+			if set(self.files) != existingFiles:
 				utils.fail(
 					'Project files were not collected for user %s' %
 					(user,))