Update to changes in enum
fix format