Sanitize more strictly