Corrected integration for issue 26393