Some bug fixed again