Fix for 'echo' issue. Issue #1