fix locate_storage_impl (take 3)