Some bug fixed