Replace it properly