try to fix the hazardous change