diff --git a/apps/shared/storage_expression_model_store.cpp b/apps/shared/storage_expression_model_store.cpp
index 8f2cb6116..6466ba7e9 100644
--- a/apps/shared/storage_expression_model_store.cpp
+++ b/apps/shared/storage_expression_model_store.cpp
@@ -63,7 +63,7 @@ StorageExpressionModel * StorageExpressionModelStore::definedModelAtIndex(int i)
   int currentModelIndex = 0;
   StorageExpressionModel * m = modelAtIndex(currentModelIndex++);
   while (!m->isNull()) {
-    assert(currentModelIndex < numberOfModels());
+    assert(currentModelIndex <= numberOfModels());
     if (m->isDefined()) {
       if (i == index) {
         return m;
diff --git a/apps/shared/storage_function_store.cpp b/apps/shared/storage_function_store.cpp
index db57a5eb6..2cb9de6e4 100644
--- a/apps/shared/storage_function_store.cpp
+++ b/apps/shared/storage_function_store.cpp
@@ -28,7 +28,7 @@ StorageFunction * StorageFunctionStore::activeFunctionAtIndex(int i) const {
   int currentModelIndex = 0;
   StorageFunction * function = modelAtIndex(currentModelIndex++);
   while (!function->isNull()) {
-    assert(currentModelIndex < numberOfModels());
+    assert(currentModelIndex <= numberOfModels());
     if (function->isActive() && function->isDefined()) {
       if (i == index) {
         return function;