Fixed echo bug