modify the bug because of the code merge