fix for Issue #376