Fixing FeatureContext