Fixed app crash