Fixed ExtraPropertiesExtractor