Error fix

* Modify files to fix error