Fix for Issue #187