Really fix the bad echo