Fixed enum issue