E0d/fix feature flag