Fix up echo_source correctly