Some bug solved