FIXED: Echo issue (on non-CSE machines)