App crash fixed