Fix for enum change