fixed some crashes of app )
it's all are good now