fixing Issue #2