Change enum lib and fix up the die.