fixed some bla bla crash