bugs fixing

bug fixing