Fix for end_marker when set echo was on.