fixed storage backend handling