Fix echo bug