Fix sanitation