Echo conditional fix