Issue #162
Issue #160 - further improvement