Correct some bug