Fixed an echoing issue