Bug fix with enum strings