bugs fixing

bugs fixing