Issue #195 & improvements to Issue #187