Fixing the echo