Fix for enum scoping