Alternate fix for bug #21 to also satisfy bug #26.