diff --git a/molgenis-data/src/main/java/org/molgenis/data/meta/MetaDataServiceImpl.java b/molgenis-data/src/main/java/org/molgenis/data/meta/MetaDataServiceImpl.java
index <HASH>..<HASH> 100644
--- a/molgenis-data/src/main/java/org/molgenis/data/meta/MetaDataServiceImpl.java
+++ b/molgenis-data/src/main/java/org/molgenis/data/meta/MetaDataServiceImpl.java
@@ -166,6 +166,8 @@ public class MetaDataServiceImpl implements MetaDataService
 
 		Repository<Entity> packages = defaultBackend.addEntityMeta(PackageRepository.META_DATA);
 		dataService.addRepository(new MetaDataRepositoryDecorator(packages));
+		// FIXME Remove this comments after the bootstrap tasks for the metadata and the indexing are finished
+		// When starting/restarting MOLGENIS the Packages entity is not indexed.
 		packageRepository = new PackageRepository(packages, reindexActionRegisterService);
 
 		attributeMetaDataRepository = new AttributeMetaDataRepository(defaultBackend, languageService,
Add FIXME for indexing System entities after bootstrap process.