bug fix for Issue #4