diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a1956a2..47060899 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,9 @@ All notable changes to this project will be documented in this file, in reverse
 - [#31](https://github.com/zendframework/zend-di/pull/31) adds the method
   `getNamespace()` to `Zend\Di\CodeGenerator\InjectorGenerator`.
 
+- [#37](https://github.com/zendframework/zend-di/pull/37) removes the use of `count()` 
+  in `Zend\Di\CodeGenerator\FactoryGenerator::buildParametersCode()` to improve performance   
+
 ### Deprecated
 
 - Nothing.
diff --git a/src/CodeGenerator/FactoryGenerator.php b/src/CodeGenerator/FactoryGenerator.php
index 9a75c6f9..8118d6b2 100644
--- a/src/CodeGenerator/FactoryGenerator.php
+++ b/src/CodeGenerator/FactoryGenerator.php
@@ -134,7 +134,7 @@ private function buildParametersCode(string $type)
         $tab = str_repeat(' ', $intention);
         $code = '';
 
-        if (count($withOptions)) {
+        if ($withOptions) {
             // Build conditional initializer code:
             // If no $params were provided ignore it completely
             // otherwise check if there is a value for each dependency in $params.