Fix enum overriding value when required