Performance fix for OpenDeclaration action