Fixed an issue where the storage-env was not properly utilized.