Fixing echo issues.