resolved other bugs
resolved other bugs