Trying to fix the echos