fix for Issue #176