Corrected ExtensionDataCollector, see issue #2325689