Some bug fixed.