Fixed bug in echo