Fixing echo issue