Fixed to use enum