Fix for Issue #142