Fix first echo