diff --git a/framework/library/astroid/Helper/Client.php b/framework/library/astroid/Helper/Client.php
index 0d4fdc52..d68015cc 100644
--- a/framework/library/astroid/Helper/Client.php
+++ b/framework/library/astroid/Helper/Client.php
@@ -204,7 +204,10 @@ public function onContentPrepareForm($form, &$data)
             $loaded = true;
         }
 
-        if (ASTROID_JOOMLA_VERSION == 4 && $loaded) {
+        $version = new \JVersion;
+        $version = $version->getShortVersion();
+        $version = substr($version, 0, 1);
+        if ($version == 4 && $loaded) {
             \JFactory::getDocument()->addScriptDeclaration('
             (function(){
                 var fixed = false;