diff --git a/lib.php b/lib.php
index 595100f..865d9bf 100644
--- a/lib.php
+++ b/lib.php
@@ -330,47 +330,66 @@ window.plagiarism_check_full_report = function (action, token) {
     form.submit();
 };
 
-require([], function () { 
+require(['jquery'], function ($) { 
+    $(function () {
         var spans = window.document.getElementsByClassName('plagiarism-pchkorg-widget');
-        for (var span of spans) {
-            for (var classname of span.classList) {
-                if (classname.includes('plagiarism-pchkorg-widget-id-')) {
-                    var id = classname.replace('plagiarism-pchkorg-widget-id-', '');
-                    if (id) {
-                        for (var data of window.plagiarism_check_data) {
-                            if (data.id == id) {
-                                var a = document.createElement('a');
-                                a.setAttribute('href', '#');
-                                a.setAttribute('title', data.title);
-                                a.style.padding = '5px 3px';
-                                a.style.textDecoration = 'none';
-                                a.style.backgroundColor = data.color;
-                                a.style.color = 'black';
-                                a.style.cursor = 'pointer';
-                                a.style.borderRadius = '3px 3px 3px 3px';
-                                a.style.margin = '4px';
-                                a.style.display = 'inline-block';
-                                a.onclick = function() { 
-                                    window.plagiarism_check_full_report(data.action, data.token); 
-                                    return false;
-                                };
-                                var label = document.createTextNode(data.label);
-                                var img = document.createElement('img');
-                                img.setAttribute('alt', 'PlagiarismCheck.org');
-                                img.setAttribute('src', data.image);
-                                img.setAttribute('width', '20');
-                                a.appendChild(img);
-                                a.appendChild(label);
-                                span.appendChild(a);
-                                break;
+        for (var s in spans) {
+            var span = spans[s];
+            if (span) {
+                for (var c in span.classList) {
+                    var classname = span.classList[c];
+                    if (classname && classname.includes('plagiarism-pchkorg-widget-id-')) {
+                        var id = classname.replace('plagiarism-pchkorg-widget-id-', '');
+                        if (id) {
+                            for (var d in window.plagiarism_check_data) {
+                                var data = window.plagiarism_check_data[d];
+                                if (data && data.id == id) {
+                                    var a = document.createElement('a');
+                                    a.setAttribute('href', '#');
+                                    a.setAttribute('title', data.title);
+                                    a.setAttribute('data-id', data.id);
+                                    a.style.padding = '5px 3px';
+                                    a.style.textDecoration = 'none';
+                                    a.style.backgroundColor = data.color;
+                                    a.style.color = 'black';
+                                    a.style.cursor = 'pointer';
+                                    a.style.borderRadius = '3px 3px 3px 3px';
+                                    a.style.margin = '4px';
+                                    a.style.display = 'inline-block';
+                                    var label = document.createTextNode(data.label);
+                                    var img = document.createElement('img');
+                                    img.setAttribute('alt', 'PlagiarismCheck.org');
+                                    img.setAttribute('src', data.image);
+                                    img.setAttribute('width', '20');
+                                    a.appendChild(img);
+                                    a.appendChild(label);
+                                    span.appendChild(a);
+                                    break;
+                                }
                             }
                         }
+                        break;
                     }
-                    break;
                 }
             }
         }
-});"
+        
+        $(window.document.body).on('click', '.plagiarism-pchkorg-widget', function(e) {
+            var id = $(e.target).closest('a').attr('data-id')
+            if (id) {
+                for (var d in window.plagiarism_check_data) {
+                    var data = window.plagiarism_check_data[d];
+                    if (data && data.id == id) {
+                        window.plagiarism_check_full_report(data.action, data.token);
+                        break;
+                    }
+                }
+            }
+            return false;
+        })
+    });
+});
+"
                     );
                 }
 
diff --git a/version.php b/version.php
index 322565a..058bd93 100644
--- a/version.php
+++ b/version.php
@@ -26,9 +26,9 @@ defined('MOODLE_INTERNAL') || die();
 if (!isset($plugin)) {
     $plugin = new stdClass();
 }
-$plugin->version = 2022060211;
+$plugin->version = 2022061418;
 $plugin->requires = 2020061501; // Requires Moodle 3.9 .
-$plugin->release = 'v3.9.5';
+$plugin->release = 'v3.9.6';
 $plugin->component = 'plagiarism_pchkorg';
 $plugin->maturity = MATURITY_STABLE;
 $plugin->dependencies = array(