fix for Issue #4