fixing Issue #101