Chenged with-pool to avoid claim errors when pool is empty