Bug fixing+Random fix