Stil fixing the bugs