Possibly fix Issue #116.