fix echo-ing