fixing echo madness