CE-1162 Sanitize output directly