Fix echo calls