Fixed crash and torch problem