Get non-echo support to work