Fix app crash