Fix echo handler