Fixed App crash