Further improvements to Issue #87