Revert "Small fix"

This reverts commit d77b4cb0261026c37885315932bbe8be5ee0b61d.
Revert "Revert "Small fix""

This reverts commit f054f82c9f048e613a820d0ad2c31350ca8ee1ed.