Fixed App crash (issue #6)