final touchup for v1.9.1