Bugfix MessageFeatureContext