conditional fix