Fix for Issue #150