diff --git a/src/Components/Columns/Column.php b/src/Components/Columns/Column.php
index 08cb3349..c44a0d7f 100644
--- a/src/Components/Columns/Column.php
+++ b/src/Components/Columns/Column.php
@@ -415,10 +415,10 @@ public function setFilterNumber()
     }
 
     /**
-     * @param \Nette\Forms\IControl $formControl
+     * @param \Nette\Forms\Control $formControl
      * @return \Grido\Components\Filters\Custom
      */
-    public function setFilterCustom(\Nette\Forms\IControl $formControl)
+    public function setFilterCustom(\Nette\Forms\Control $formControl)
     {
         return $this->grid->addFilterCustom($this->getName(), $formControl);
     }
diff --git a/src/Components/Columns/Editable.php b/src/Components/Columns/Editable.php
index 10a0c264..f90420e8 100644
--- a/src/Components/Columns/Editable.php
+++ b/src/Components/Columns/Editable.php
@@ -21,7 +21,7 @@
  * @author      Jakub Kopřiva <kopriva.jakub@gmail.com>
  * @author      Petr Bugyík
  *
- * @property \Nette\Forms\IControl $editableControl
+ * @property \Nette\Forms\Control $editableControl
  * @property callback $editableCallback
  * @property callback $editableValueCallback
  * @property callback $editableRowCallback
@@ -36,7 +36,7 @@ abstract class Editable extends Column
     /** @var bool */
     protected $editableDisabled = FALSE;
 
-    /** @var \Nette\Forms\IControl Custom control for inline editing */
+    /** @var \Nette\Forms\Control Custom control for inline editing */
     protected $editableControl;
 
     /** @var callback for custom handling with edited data; function($id, $newValue, $oldValue, Editable $column) {} */
@@ -51,10 +51,10 @@ abstract class Editable extends Column
     /**
      * Sets column as editable.
      * @param callback $callback function($id, $newValue, $oldValue, Columns\Editable $column) {}
-     * @param \Nette\Forms\IControl $control
+     * @param \Nette\Forms\Control $control
      * @return Editable
      */
-    public function setEditable($callback = NULL, \Nette\Forms\IControl $control = NULL)
+    public function setEditable($callback = NULL, \Nette\Forms\Control $control = NULL)
     {
         $this->editable = TRUE;
         $this->setClientSideOptions();
@@ -67,10 +67,10 @@ public function setEditable($callback = NULL, \Nette\Forms\IControl $control = N
 
     /**
      * Sets control for inline editation.
-     * @param \Nette\Forms\IControl $control
+     * @param \Nette\Forms\Control $control
      * @return Editable
      */
-    public function setEditableControl(\Nette\Forms\IControl $control)
+    public function setEditableControl(\Nette\Forms\Control $control)
     {
         $this->isEditable() ?: $this->setEditable();
         $this->editableControl = $control;
diff --git a/src/Components/Container.php b/src/Components/Container.php
index 692d8e82..a5572d34 100644
--- a/src/Components/Container.php
+++ b/src/Components/Container.php
@@ -345,10 +345,10 @@ public function addFilterNumber($name, $label)
 
     /**
      * @param string $name
-     * @param \Nette\Forms\IControl $formControl
+     * @param \Nette\Forms\Control $formControl
      * @return Filters\Custom
      */
-    public function addFilterCustom($name, \Nette\Forms\IControl $formControl)
+    public function addFilterCustom($name, \Nette\Forms\Control $formControl)
     {
         return new Filters\Custom($this, $name, NULL, $formControl);
     }
diff --git a/src/Components/Filters/Custom.php b/src/Components/Filters/Custom.php
index 9adc95f1..3b9a2c52 100644
--- a/src/Components/Filters/Custom.php
+++ b/src/Components/Filters/Custom.php
@@ -18,20 +18,20 @@
  * @subpackage  Components\Filters
  * @author      Petr Bugyík
  *
- * @property-read \Nette\Forms\IControl $formControl
+ * @property-read \Nette\Forms\Control $formControl
  */
 class Custom extends Filter
 {
-    /** @var \Nette\Forms\IControl */
+    /** @var \Nette\Forms\Control */
     protected $formControl;
 
     /**
      * @param \Grido\Grid $grid
      * @param string $name
      * @param string $label
-     * @param \Nette\Forms\IControl $formControl
+     * @param \Nette\Forms\Control $formControl
      */
-    public function __construct($grid, $name, $label, \Nette\Forms\IControl $formControl)
+    public function __construct($grid, $name, $label, \Nette\Forms\Control $formControl)
     {
         $this->formControl = $formControl;
 
@@ -39,7 +39,7 @@ public function __construct($grid, $name, $label, \Nette\Forms\IControl $formCon
     }
 
     /**
-     * @return \Nette\Forms\IControl
+     * @return \Nette\Forms\Control
      * @internal
      */
     public function getFormControl()
diff --git a/src/Grid.php b/src/Grid.php
index 1e078ab5..fca161e3 100644
--- a/src/Grid.php
+++ b/src/Grid.php
@@ -611,15 +611,19 @@ public function getPaginator()
      */
     public function getProperty($object, $name)
     {
-        if ($object instanceof \Nette\Database\Table\IRow && \Nette\Utils\Strings::contains($name, '.')) {
-            $parts = explode('.', $name);
-            foreach ($parts as $item) {
-                if (is_object($object)) {
-                    $object = $object->$item;
+        if ($object instanceof \Nette\Database\Table\IRow) {
+            if (\Nette\Utils\Strings::contains($name, '.')) {
+                $parts = explode('.', $name);
+                foreach ($parts as $item) {
+                    if (is_object($object)) {
+                        $object = $object->$item;
+                    }
                 }
-            }
 
-            return $object;
+                return $object;
+            } else {
+                return $object->$name;
+            }
         }
 
         if (is_array($object)) {