Fixed crash and updated