first cut at fix for Issue #172