fix for Issue #6