Bug fixed

Some bug fixed