Changed way feature flag was checked