Issue #2 fixed