changing code related to Issue #9