incorporate CESSH / wceex compat