* Bug fixing