Fixed remaining issue with echo server