Fix Some bug