diff --git a/pym/cl_fill.py b/pym/cl_fill.py
index 5b63520..d67eb18 100644
--- a/pym/cl_fill.py
+++ b/pym/cl_fill.py
@@ -446,9 +446,6 @@ class fillVars(varsShare):
                            os.listdir(xorg_modules_dir)))
         else:
             list_avialable_drivers = []
-        videoVal = self.getValueFromCmdLine("calculate",4)
-        if videoVal in list_avialable_drivers + ["auto"]:
-            return videoVal
         if display and list_avialable_drivers:
             reDriver = re.compile('|'.join(map(lambda x: "%s_drv.so"%x,
                                                list_avialable_drivers)))
@@ -474,6 +471,11 @@ class fillVars(varsShare):
                                       matchSect.group(0),re.S)
                 if resDriver and resDriver.group(1) in list_avialable_drivers:
                     return resDriver.group(1)
+
+        videoVal = self.getValueFromCmdLine("calculate",4)
+        videoVal = {'i915':'intel'}.get(videoVal,videoVal)
+        if videoVal in list_avialable_drivers:
+            return videoVal
         defaultDriver = {
             'vesa':'vesa',
             'nvidia':'nvidia' if "nvidia" in list_avialable_drivers else "nv",