Replaced wrong echo for return