Fixed a bug that re-introduced the echo bug.