Undefined variable $storage_name bug fixed