fix locate_storage_impl (take 2)

Thanks Magne Land