fix same code and back same code
back some code