finaly fix replace