Bugs fixed

bug fixed