Release 2..fix app crash