MDL-37085 changed echo to return - little bug fix