Fixed crash, updated tool